(map_char_table): Do not operate on invalid characters.

Pay attention to `enable-multibyte-characters'.

diff --git a/src/fns.c b/src/fns.c
index d95cd07239362259255cc3093c56f3f9886d3cc1..dc4f1a5ff3b6d25bfb51be7b531aa2a3b7391213 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1482,11 +1482,13 @@ map_char_table (c_function, function, subtable, arg, depth, indices)
          else
            call2 (function, make_number (i), elt);
        }
+      if (NILP (current_buffer->enable_multibyte_characters))
+       return;
       to = CHAR_TABLE_ORDINARY_SLOTS;
     }
   else
     {
-      i = 0;
+      i = 32;
       to = SUB_CHAR_TABLE_ORDINARY_SLOTS;
     }